added SCANGOBJ_OPTIONS to set the type-init-func to pass to

2002-01-23  Damon Chaplin  <damon@ximian.com>

	* gtk/Makefile.am: added SCANGOBJ_OPTIONS to set the type-init-func
	to pass to gtkdoc-scangobj.

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index e0c63167611a0d23b0db0a7a85ce97b9fe30bbfc..7e7e5e089717376f3086c90d2901d7845f76c70b 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-23  Damon Chaplin  <damon@ximian.com>
+
+       * gtk/Makefile.am: added SCANGOBJ_OPTIONS to set the type-init-func
+       to pass to gtkdoc-scangobj.
+
 Mon Jan 21 23:39:42 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/tmpl/gtkfixed.sgml: change guint16 to gint to reflect

diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 61d40133f7bc6545b1bda1dd4d3f3eed10f92bc2..f163b95a46bdb3e894c7758c9f60f6ae87ac7e08 100644 (file)
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -9,6 +9,9 @@ DOC_MAIN_SGML_FILE=gtk-docs.sgml
 # The directory containing the source code. Relative to $(srcdir)
 DOC_SOURCE_DIR=../../../gtk
 
+# Extra options to pass to gtkdoc-scangobj
+SCANGOBJ_OPTIONS=--type-init-func="gtk_type_init(0)" 
+
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS=--deprecated-guards="GTK_ENABLE_BROKEN|GTK_DISABLE_DEPRECATED" 
 
@@ -198,7 +201,7 @@ all-local: html-build.stamp
 scan-build.stamp: $(HFILE_GLOB)
        @echo '*** Scanning header files ***'
        if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
-           CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+           CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
        else \
            cd $(srcdir) ; \
            for i in $(SCANOBJ_FILES) ; do \